Get rid of convoluted macros in iwm's receive code path.

Since we now sync the entire Rx DMA buffer the SYNC_RESP_STRUCT() macro which
was used to sync just parts of the buffer can be replaced by assignments.
The SYNC_RESP_PTR() macro was already unused so just remove it.
The ADVANCE_RXQ() macro was used just once so expand it in place.

diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index a5c8ef9..351c0e5 100644 (file)
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_iwm.c,v 1.174 2017/04/26 08:19:09 stsp Exp $       */
+/*     $OpenBSD: if_iwm.c,v 1.175 2017/04/26 09:19:56 stsp Exp $       */
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -6485,22 +6485,6 @@ iwm_nic_error(struct iwm_softc *sc)
 }
 #endif
 
-#define SYNC_RESP_STRUCT(_var_, _pkt_)                                 \
-do {                                                                   \
-       bus_dmamap_sync(sc->sc_dmat, data->map, sizeof(*(_pkt_)),       \
-           sizeof(*(_var_)), BUS_DMASYNC_POSTREAD);                    \
-       _var_ = (void *)((_pkt_)+1);                                    \
-} while (/*CONSTCOND*/0)
-
-#define SYNC_RESP_PTR(_ptr_, _len_, _pkt_)                             \
-do {                                                                   \
-       bus_dmamap_sync(sc->sc_dmat, data->map, sizeof(*(_pkt_)),       \
-           sizeof(len), BUS_DMASYNC_POSTREAD);                         \
-       _ptr_ = (void *)((_pkt_)+1);                                    \
-} while (/*CONSTCOND*/0)
-
-#define ADVANCE_RXQ(sc) (sc->rxq.cur = (sc->rxq.cur + 1) % IWM_RX_RING_COUNT);
-
 void
 iwm_rx_mpdu(struct iwm_softc *sc, struct mbuf *m)
 {
@@ -6607,7 +6591,7 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
                        struct iwm_alive_resp_v3 *resp3;
 
                        if (iwm_rx_packet_payload_len(pkt) == sizeof(*resp1)) {
-                               SYNC_RESP_STRUCT(resp1, pkt);
+                               resp1 = (void *)pkt->data;
                                sc->sc_uc.uc_error_event_table
                                    = le32toh(resp1->error_event_table_ptr);
                                sc->sc_uc.uc_log_event_table
@@ -6620,7 +6604,7 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
                        }
 
                        if (iwm_rx_packet_payload_len(pkt) == sizeof(*resp2)) {
-                               SYNC_RESP_STRUCT(resp2, pkt);
+                               resp2 = (void *)pkt->data;
                                sc->sc_uc.uc_error_event_table
                                    = le32toh(resp2->error_event_table_ptr);
                                sc->sc_uc.uc_log_event_table
@@ -6635,7 +6619,7 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
                        }
 
                        if (iwm_rx_packet_payload_len(pkt) == sizeof(*resp3)) {
-                               SYNC_RESP_STRUCT(resp3, pkt);
+                               resp3 = (void *)pkt->data;
                                sc->sc_uc.uc_error_event_table
                                    = le32toh(resp3->error_event_table_ptr);
                                sc->sc_uc.uc_log_event_table
@@ -6656,25 +6640,19 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
 
                case IWM_CALIB_RES_NOTIF_PHY_DB: {
                        struct iwm_calib_res_notif_phy_db *phy_db_notif;
-                       SYNC_RESP_STRUCT(phy_db_notif, pkt);
+                       phy_db_notif = (void *)pkt->data;
                        iwm_phy_db_set_section(sc, phy_db_notif);
                        break;
                }
 
-               case IWM_STATISTICS_NOTIFICATION: {
-                       struct iwm_notif_statistics *stats;
-                       SYNC_RESP_STRUCT(stats, pkt);
-                       memcpy(&sc->sc_stats, stats, sizeof(sc->sc_stats));
-                       sc->sc_noise = iwm_get_noise(&stats->rx.general);
+               case IWM_STATISTICS_NOTIFICATION:
+                       memcpy(&sc->sc_stats, pkt->data, sizeof(sc->sc_stats));
+                       sc->sc_noise = iwm_get_noise(&sc->sc_stats.rx.general);
                        break;
-               }
 
                case IWM_NVM_ACCESS_CMD:
                case IWM_MCC_UPDATE_CMD:
                        if (sc->sc_wantresp == ((qid << 16) | idx)) {
-                               bus_dmamap_sync(sc->sc_dmat, data->map, 0,
-                                   sizeof(sc->sc_cmd_resp),
-                                   BUS_DMASYNC_POSTREAD);
                                memcpy(sc->sc_cmd_resp,
                                    pkt, sizeof(sc->sc_cmd_resp));
                        }
@@ -6682,11 +6660,11 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
 
                case IWM_MCC_CHUB_UPDATE_CMD: {
                        struct iwm_mcc_chub_notif *notif;
-                       SYNC_RESP_STRUCT(notif, pkt);
-
+                       notif = (void *)pkt->data;
                        sc->sc_fw_mcc[0] = (notif->mcc & 0xff00) >> 8;
                        sc->sc_fw_mcc[1] = notif->mcc & 0xff;
                        sc->sc_fw_mcc[2] = '\0';
+                       break;
                }
 
                case IWM_DTS_MEASUREMENT_NOTIFICATION:
@@ -6712,7 +6690,7 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
                case IWM_LQ_CMD:
                case IWM_BT_CONFIG:
                case IWM_REPLY_THERMAL_MNG_BACKOFF:
-                       SYNC_RESP_STRUCT(cresp, pkt);
+                       cresp = (void *)pkt->data;
                        if (sc->sc_wantresp == ((qid << 16) | idx)) {
                                memcpy(sc->sc_cmd_resp,
                                    pkt, sizeof(*pkt)+sizeof(*cresp));
@@ -6728,48 +6706,32 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
                        wakeup(&sc->sc_init_complete);
                        break;
 
-               case IWM_SCAN_OFFLOAD_COMPLETE: {
-                       struct iwm_periodic_scan_complete *notif;
-                       SYNC_RESP_STRUCT(notif, pkt);
+               case IWM_SCAN_OFFLOAD_COMPLETE:
                        break;
-               }
 
-               case IWM_SCAN_ITERATION_COMPLETE: {
-                       struct iwm_lmac_scan_complete_notif *notif;
-                       SYNC_RESP_STRUCT(notif, pkt);
+               case IWM_SCAN_ITERATION_COMPLETE:
                        task_add(sc->sc_eswq, &sc->sc_eswk);
                        break;
-               }
 
-               case IWM_SCAN_COMPLETE_UMAC: {
-                       struct iwm_umac_scan_complete *notif;
-                       SYNC_RESP_STRUCT(notif, pkt);
+               case IWM_SCAN_COMPLETE_UMAC:
                        task_add(sc->sc_eswq, &sc->sc_eswk);
                        break;
-               }
-
-               case IWM_SCAN_ITERATION_COMPLETE_UMAC: {
-                       struct iwm_umac_scan_iter_complete_notif *notif;
-                       SYNC_RESP_STRUCT(notif, pkt);
 
+               case IWM_SCAN_ITERATION_COMPLETE_UMAC:
                        task_add(sc->sc_eswq, &sc->sc_eswk);
                        break;
-               }
 
                case IWM_REPLY_ERROR: {
                        struct iwm_error_resp *resp;
-                       SYNC_RESP_STRUCT(resp, pkt);
+                       resp = (void *)pkt->data;
                        printf("%s: firmware error 0x%x, cmd 0x%x\n",
                                DEVNAME(sc), le32toh(resp->error_type),
                                resp->cmd_id);
                        break;
                }
 
-               case IWM_TIME_EVENT_NOTIFICATION: {
-                       struct iwm_time_event_notif *notif;
-                       SYNC_RESP_STRUCT(notif, pkt);
+               case IWM_TIME_EVENT_NOTIFICATION:
                        break;
-               }
 
                /*
                 * Firmware versions 21 and 22 generate some DEBUG_LOG_MSG
@@ -6781,12 +6743,8 @@ iwm_rx_pkt(struct iwm_softc *sc, struct iwm_rx_data *data)
                case IWM_MCAST_FILTER_CMD:
                        break;
 
-               case IWM_SCD_QUEUE_CFG: {
-                       struct iwm_scd_txq_cfg_rsp *rsp;
-                       SYNC_RESP_STRUCT(rsp, pkt);
-
+               case IWM_SCD_QUEUE_CFG:
                        break;
-               }
 
                default:
                        printf("%s: unhandled firmware response 0x%x/0x%x "
@@ -6827,7 +6785,7 @@ iwm_notif_intr(struct iwm_softc *sc)
                struct iwm_rx_data *data = &sc->rxq.data[sc->rxq.cur];
 
                iwm_rx_pkt(sc, data);
-               ADVANCE_RXQ(sc);
+               sc->rxq.cur = (sc->rxq.cur + 1) % IWM_RX_RING_COUNT;
        }
 
        IWM_CLRBITS(sc, IWM_CSR_GP_CNTRL,